[packages_10.03.2] merge r30317

git-svn-id: svn://svn.openwrt.org/openwrt/branches/packages_10.03.2@30318 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index 2ba6d4b..931a39c 100644 (file)
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
 PKG_VERSION:=1.6.12
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_MD5SUM:=a3cbfdb6e1e5beea181a7349749719f3
 
 PKG_SOURCE_URL:= \

diff --git a/admin/syslog-ng/files/syslog-ng.init b/admin/syslog-ng/files/syslog-ng.init
index a8bad3d..4a27068 100644 (file)
--- a/admin/syslog-ng/files/syslog-ng.init
+++ b/admin/syslog-ng/files/syslog-ng.init
@@ -6,7 +6,7 @@ START=50
 SERVICE_USE_PID=1
 
 start() {
-       [ -f /etc/syslog-ng.conf ] || return 1
+       [ -f /etc/syslog-ng/syslog-ng.conf ] || return 1
        service_start /usr/sbin/syslog-ng
 }